Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(datastore): resolve swiftformat errors and warnings #3848

Merged
merged 6 commits into from
Oct 2, 2024
Merged

chore(datastore): resolve swiftformat errors and warnings #3848

merged 6 commits into from
Oct 2, 2024

Conversation

phantumcode
Copy link
Contributor

Issue #

Description

Resolving SwiftFormat errors and warnings for the DataStore plugin.

General Checklist

  • Added new tests to cover change, if needed
  • Build succeeds with all target using Swift Package Manager
  • All unit tests pass
  • All integration tests pass
  • Security oriented best practices and standards are followed (e.g. using input sanitization, principle of least privilege, etc)
  • Documentation update for the change if required
  • PR title conforms to conventional commit style
  • New or updated tests include Given When Then inline code documentation and are named accordingly testThing_condition_expectation()
  • If breaking change, documentation/changelog update with migration instructions

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@phantumcode phantumcode requested a review from a team as a code owner September 3, 2024 18:01
@codecov Codecov
Copy link

codecov bot commented Sep 10, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 85.12556% with 231 lines in your changes missing coverage. Please review.

Project coverage is 68.76%. Comparing base (ca6c65a) to head (c0621b2).
Report is 4 commits behind head on chore/resolve_swiftformat.

Files with missing lines Patch % Lines
...gin/AWSDataStorePlugin+DataStoreBaseBehavior.swift 40.87% 81 Missing ⚠️
...utationDatabaseAdapter+MutationEventIngester.swift 69.84% 19 Missing ⚠️
...age/SQLite/StorageEngineAdapter+UntypedModel.swift 40.00% 18 Missing ⚠️
...ngMutationQueue/SyncMutationToCloudOperation.swift 61.36% 17 Missing ⚠️
...Sync/IncomingAsyncSubscriptionEventPublisher.swift 50.00% 12 Missing ⚠️
.../OutgoingMutationQueue/OutgoingMutationQueue.swift 86.07% 11 Missing ⚠️
...tionSync/AWSIncomingEventReconciliationQueue.swift 67.74% 10 Missing ⚠️
...taStorePlugin/Storage/SQLite/Statement+Model.swift 66.66% 9 Missing ⚠️
...n/Storage/SQLite/StorageEngineAdapter+SQLite.swift 94.88% 9 Missing ⚠️
...DataStorePlugin/Storage/StorageEngineAdapter.swift 0.00% 9 Missing ⚠️
... and 14 more
Additional details and impacted files 
@@                      Coverage Diff                      @@
##           chore/resolve_swiftformat    #3848      +/-   ##
=============================================================
+ Coverage                      68.51%   68.76%   +0.25%     
=============================================================
  Files                           1080     1080              
  Lines                          37608    38055     +447     
=============================================================
+ Hits                           25766    26169     +403     
- Misses                         11842    11886      +44
Flag Coverage Δ
API_plugin_unit_test 68.99% <ø> (+0.03%) ⬆️
AWSPluginsCore 68.56% <ø> (ø)
Amplify 47.56% <ø> (ø)
Analytics_plugin_unit_test 84.52% <ø> (ø)
Auth_plugin_unit_test 79.84% <ø> (+0.16%) ⬆️
DataStore_plugin_unit_test 81.52% <85.12%> (+0.30%) ⬆️
Geo_plugin_unit_test 72.00% <ø> (ø)
Logging_plugin_unit_test 62.95% <ø> (ø)
Predictions_plugin_unit_test 37.32% <ø> (ø)
PushNotifications_plugin_unit_test 86.21% <ø> (ø)
Storage_plugin_unit_test 76.81% <ø> (ø)
unit_tests 68.76% <85.12%> (+0.25%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

5d
5d reviewed Sep 16, 2024
View reviewed changes
...yPlugins/DataStore/Sources/AWSDataStorePlugin/AWSDataStorePlugin+DataStoreBaseBehavior.swift Show resolved Hide resolved
AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Storage/SQLite/Model+SQLite.swift
@@ -172,7 +178,7 @@ extension Model {

}

extension Array where Element == ModelSchema {
extension [ModelSchema] {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

first time I've seen this syntax, like it, looks more concise.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added in Swift 5.7, https://github.com/swiftlang/swift-evolution/blob/main/proposals/0361-bound-generic-extensions.md

...yPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/InitialSync/ModelSyncedEventEmitter.swift Outdated Show resolved Hide resolved
AmplifyPlugins/DataStore/Sources/AWSDataStorePlugin/Sync/InitialSync/ReadyEventEmitter.swift Show resolved Hide resolved
@phantumcode phantumcode merged commit 6d8a81f into chore/resolve_swiftformat Oct 2, 2024
68 of 70 checks passed
@phantumcode phantumcode deleted the chore/resolve_swiftformat_datastore branch October 2, 2024 17:49
@phantumcode phantumcode mentioned this pull request Oct 24, 2024
Open
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@5d 5d 5d approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@phantumcode @5d